Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 2 Sep 2011 18:27:41 +0000 (11:27 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 2 Sep 2011 18:27:41 +0000 (11:27 -0700)

Trivial merge